Update patches

diff --git a/debian/patches/10_matplotlib.patch b/debian/patches/10_matplotlib.patch
index bdfbb09a74f73f7809a7c9d1177d72cd1acb69fe..3e739a948e21585f4bb09232f42d02ac213193c4 100644 (file)
--- a/debian/patches/10_matplotlib.patch
+++ b/debian/patches/10_matplotlib.patch
@@ -1,9 +1,9 @@
 Description: _matplotlib
-Index: VTK-9.2.5/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+Index: VTK-9.3.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
 ===================================================================
---- VTK-9.2.5.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-+++ VTK-9.2.5/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-@@ -199,6 +199,10 @@ private:
+--- VTK-9.3.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
++++ VTK-9.3.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+@@ -190,6 +190,10 @@ private:
     * to implement IsAvailable.
     */
    static Availability CheckMPLAvailability();

diff --git a/debian/patches/20_do_not_link_against_socket.patch b/debian/patches/20_do_not_link_against_socket.patch
index 87bd61a7b5e95bc4a73fe2b949cd7956600d971f..15f4bf44a2e2850f47da1b203fd3dabe5da07962 100644 (file)
--- a/debian/patches/20_do_not_link_against_socket.patch
+++ b/debian/patches/20_do_not_link_against_socket.patch
@@ -1,10 +1,10 @@
 Description: Do not try linking with -lsocket
 
-Index: VTK-9.2.5/Common/System/vtkTestSocketFeatures.cmake
+Index: VTK-9.3.0/Common/System/vtkTestSocketFeatures.cmake
 ===================================================================
---- VTK-9.2.5.orig/Common/System/vtkTestSocketFeatures.cmake
-+++ VTK-9.2.5/Common/System/vtkTestSocketFeatures.cmake
-@@ -6,9 +6,6 @@ check_library_exists("socket" getsocknam
+--- VTK-9.3.0.orig/Common/System/vtkTestSocketFeatures.cmake
++++ VTK-9.3.0/Common/System/vtkTestSocketFeatures.cmake
+@@ -11,9 +11,6 @@ check_library_exists("socket" getsocknam
  
  if(NOT DEFINED VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T)
    set(VTK_GETSOCKNAME_LIBS)

diff --git a/debian/patches/30_drop_medical_example.patch b/debian/patches/30_drop_medical_example.patch
index e95bc66edba204797695be66099ce3a4be2dbc9a..4c13428495cb8f8bfe9c8d205300a66968254882 100644 (file)
--- a/debian/patches/30_drop_medical_example.patch
+++ b/debian/patches/30_drop_medical_example.patch
@@ -1,11 +1,11 @@
 Description: Drop medical examples
 Last-Update: 2020-10-21
 
-Index: VTK-9.2.5/Examples/CMakeLists.txt
+Index: VTK-9.3.0/Examples/CMakeLists.txt
 ===================================================================
---- VTK-9.2.5.orig/Examples/CMakeLists.txt
-+++ VTK-9.2.5/Examples/CMakeLists.txt
-@@ -56,7 +56,7 @@ else ()
+--- VTK-9.3.0.orig/Examples/CMakeLists.txt
++++ VTK-9.3.0/Examples/CMakeLists.txt
+@@ -61,7 +61,7 @@ else ()
    add_example(IO/Cxx)
    add_example(ImageProcessing/Cxx)
    add_example(Infovis/Cxx)

diff --git a/debian/patches/40_vtkpython-9.patch b/debian/patches/40_vtkpython-9.patch
index e09b283610670baf8e2cbfb7ee4c2972269109c1..a663f2398823b140f8277092109948a4366bff1c 100644 (file)
--- a/debian/patches/40_vtkpython-9.patch
+++ b/debian/patches/40_vtkpython-9.patch
@@ -2,10 +2,10 @@ Description: Rename vtkpython to vtkpython-9.0
 Author: Anton Gladky <gladk@debian.org>
 Last-Update: 2020-11-05
 
-Index: VTK-9.2.5/Wrapping/Python/CMakeLists.txt
+Index: VTK-9.3.0/Wrapping/Python/CMakeLists.txt
 ===================================================================
---- VTK-9.2.5.orig/Wrapping/Python/CMakeLists.txt
-+++ VTK-9.2.5/Wrapping/Python/CMakeLists.txt
+--- VTK-9.3.0.orig/Wrapping/Python/CMakeLists.txt
++++ VTK-9.3.0/Wrapping/Python/CMakeLists.txt
 @@ -23,21 +23,21 @@ endif ()
  
  # The interpreters are not supported in wheel builds, so skip them.

diff --git a/debian/patches/50_fix_python-modules_path.patch b/debian/patches/50_fix_python-modules_path.patch
index 1114f017f2acf6d3c3507133ef67a50cbeb90606..7ad6564106321ab5d049250abff1b2be61101eaa 100644 (file)
--- a/debian/patches/50_fix_python-modules_path.patch
+++ b/debian/patches/50_fix_python-modules_path.patch
@@ -2,11 +2,11 @@ Description: Fix path for the installation of python modules
 Author: Anton Gladky <gladk@debian.org>
 Last-Update: 2020-11-06
 
-Index: VTK-9.2.5/CMake/vtkModuleWrapPython.cmake
+Index: VTK-9.3.0/CMake/vtkModuleWrapPython.cmake
 ===================================================================
---- VTK-9.2.5.orig/CMake/vtkModuleWrapPython.cmake
-+++ VTK-9.2.5/CMake/vtkModuleWrapPython.cmake
-@@ -87,7 +87,7 @@ function (vtk_module_python_default_dest
+--- VTK-9.3.0.orig/CMake/vtkModuleWrapPython.cmake
++++ VTK-9.3.0/CMake/vtkModuleWrapPython.cmake
+@@ -78,7 +78,7 @@ function (vtk_module_python_default_dest
          "for Python modules.")
        set(_vtk_python_version_suffix)
      endif ()
@@ -15,11 +15,11 @@ Index: VTK-9.2.5/CMake/vtkModuleWrapPython.cmake
    endif ()
  
    set("${var}" "${destination}" PARENT_SCOPE)
-Index: VTK-9.2.5/Utilities/Python/CMakeLists.txt
+Index: VTK-9.3.0/Utilities/Python/CMakeLists.txt
 ===================================================================
---- VTK-9.2.5.orig/Utilities/Python/CMakeLists.txt
-+++ VTK-9.2.5/Utilities/Python/CMakeLists.txt
-@@ -85,7 +85,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX)
+--- VTK-9.3.0.orig/Utilities/Python/CMakeLists.txt
++++ VTK-9.3.0/Utilities/Python/CMakeLists.txt
+@@ -61,7 +61,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX)
      set(VTK_PYTHON_SITE_PACKAGES_SUFFIX "Lib/site-packages")
    else ()
      set(VTK_PYTHON_SITE_PACKAGES_SUFFIX

diff --git a/debian/patches/60_fix_path_perl.patch b/debian/patches/60_fix_path_perl.patch
index c6c9b0a346488a3cb2851928eef22a3dac9ef586..2a50bd7a8b995f88994a7658b10e8b9d2363061a 100644 (file)
--- a/debian/patches/60_fix_path_perl.patch
+++ b/debian/patches/60_fix_path_perl.patch
@@ -2,60 +2,60 @@ Description: Fix shebang for the perl scripts
 Author: Anton Gladky <gladk@debian.org>
 Last-Update: 2020-11-08
 
-Index: VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl
+Index: VTK-9.3.0/Utilities/Doxygen/doc_class2example.pl
 ===================================================================
---- VTK-9.2.5.orig/Utilities/Doxygen/doc_class2example.pl
-+++ VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl
+--- VTK-9.3.0.orig/Utilities/Doxygen/doc_class2example.pl
++++ VTK-9.3.0/Utilities/Doxygen/doc_class2example.pl
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env perl
 +#!/usr/bin/perl
  # Time-stamp: <2004-06-09 11:12:38 barre>
  #
  # Build cross-references between classes and examples
-Index: VTK-9.2.5/Utilities/Doxygen/doc_cleanhtml.pl
+Index: VTK-9.3.0/Utilities/Doxygen/doc_cleanhtml.pl
 ===================================================================
---- VTK-9.2.5.orig/Utilities/Doxygen/doc_cleanhtml.pl
-+++ VTK-9.2.5/Utilities/Doxygen/doc_cleanhtml.pl
+--- VTK-9.3.0.orig/Utilities/Doxygen/doc_cleanhtml.pl
++++ VTK-9.3.0/Utilities/Doxygen/doc_cleanhtml.pl
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env perl
 +#!/usr/bin/perl
  # Time-stamp: <2002-10-25 20:17:59 barre>
  #
  # Clean the HTML generated by Doxygen to remove some layout quicks
-Index: VTK-9.2.5/Utilities/Doxygen/doc_codematch.pl
+Index: VTK-9.3.0/Utilities/Doxygen/doc_codematch.pl
 ===================================================================
---- VTK-9.2.5.orig/Utilities/Doxygen/doc_codematch.pl
-+++ VTK-9.2.5/Utilities/Doxygen/doc_codematch.pl
+--- VTK-9.3.0.orig/Utilities/Doxygen/doc_codematch.pl
++++ VTK-9.3.0/Utilities/Doxygen/doc_codematch.pl
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env perl
 +#!/usr/bin/perl
  # Time-stamp: <2002-01-18 16:17:26 barre>
  #
  # Summary ?
-Index: VTK-9.2.5/Utilities/Doxygen/doc_index.pl
+Index: VTK-9.3.0/Utilities/Doxygen/doc_index.pl
 ===================================================================
---- VTK-9.2.5.orig/Utilities/Doxygen/doc_index.pl
-+++ VTK-9.2.5/Utilities/Doxygen/doc_index.pl
+--- VTK-9.3.0.orig/Utilities/Doxygen/doc_index.pl
++++ VTK-9.3.0/Utilities/Doxygen/doc_index.pl
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env perl
 +#!/usr/bin/perl
  # Time-stamp: <2001-11-21 17:40:48 barre>
  #
  # Build full-text index
-Index: VTK-9.2.5/Utilities/Doxygen/doc_rmpath.pl
+Index: VTK-9.3.0/Utilities/Doxygen/doc_rmpath.pl
 ===================================================================
---- VTK-9.2.5.orig/Utilities/Doxygen/doc_rmpath.pl
-+++ VTK-9.2.5/Utilities/Doxygen/doc_rmpath.pl
+--- VTK-9.3.0.orig/Utilities/Doxygen/doc_rmpath.pl
++++ VTK-9.3.0/Utilities/Doxygen/doc_rmpath.pl
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env perl
 +#!/usr/bin/perl
  # Time-stamp: <2001-10-05 11:49:40 barre>
  #
  # Remove path to intermediate Doxygen dir from html doc
-Index: VTK-9.2.5/Utilities/Doxygen/doc_version.pl
+Index: VTK-9.3.0/Utilities/Doxygen/doc_version.pl
 ===================================================================
---- VTK-9.2.5.orig/Utilities/Doxygen/doc_version.pl
-+++ VTK-9.2.5/Utilities/Doxygen/doc_version.pl
+--- VTK-9.3.0.orig/Utilities/Doxygen/doc_version.pl
++++ VTK-9.3.0/Utilities/Doxygen/doc_version.pl
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env perl
 +#!/usr/bin/perl

diff --git a/debian/patches/83_allow_gles_platforms.patch b/debian/patches/83_allow_gles_platforms.patch
deleted file mode 100644 (file)
index 375bc7b..0000000
--- a/debian/patches/83_allow_gles_platforms.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Subject: HACK: QVTKOpenGLWindow.cxx: Define GL_BACK_{LEFT,RIGHT} for Qt with OpenGL ES
-From: Adrian Bunk <bunk@debian.org>
-
-Date: Fri, 11 Dec 2020 10:42:37 +0200
-
-
----
- GUISupport/Qt/QVTKOpenGLWindow.cxx | 5 +++++
- 1 file changed, 5 insertions(+)
-
-Index: VTK-9.2.5/GUISupport/Qt/QVTKOpenGLWindow.cxx
-===================================================================
---- VTK-9.2.5.orig/GUISupport/Qt/QVTKOpenGLWindow.cxx
-+++ VTK-9.2.5/GUISupport/Qt/QVTKOpenGLWindow.cxx
-@@ -34,6 +34,11 @@
- #include "vtkObjectFactory.h"
- #include "vtkOpenGLState.h"
- 
-+#ifndef GL_BACK_LEFT
-+#define GL_BACK_LEFT GL_BACK
-+#define GL_BACK_RIGHT GL_BACK
-+#endif
-+
- QVTKOpenGLWindow::QVTKOpenGLWindow(QOpenGLWindow::UpdateBehavior ub, QWindow* p)
-   : QVTKOpenGLWindow(vtkSmartPointer<vtkGenericOpenGLRenderWindow>::New(), nullptr, ub, p)
- {

diff --git a/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch b/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch
index 21121325bb547a5b5c09bd89dd6ac1b849b64edb..206b73ed7d02f4b78475046370574828b16b39cb 100644 (file)
--- a/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch
+++ b/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch
@@ -2,11 +2,11 @@ Description: HACK: vtkQWidgetTexture.cxx: Don't use vtkOpenGLCheckErrorMacro
  Fixes building for Qt with OpenGL ES.
 Author: Adrian Bunk <bunk@debian.org>
 
-Index: VTK-9.2.5/GUISupport/Qt/vtkQWidgetTexture.cxx
+Index: VTK-9.3.0/GUISupport/Qt/vtkQWidgetTexture.cxx
 ===================================================================
---- VTK-9.2.5.orig/GUISupport/Qt/vtkQWidgetTexture.cxx
-+++ VTK-9.2.5/GUISupport/Qt/vtkQWidgetTexture.cxx
-@@ -18,7 +18,7 @@
+--- VTK-9.3.0.orig/GUISupport/Qt/vtkQWidgetTexture.cxx
++++ VTK-9.3.0/GUISupport/Qt/vtkQWidgetTexture.cxx
+@@ -7,7 +7,7 @@
  #include "vtkOpenGLResourceFreeCallback.h"
  #include "vtkOpenGLState.h"
  
@@ -15,7 +15,7 @@ Index: VTK-9.2.5/GUISupport/Qt/vtkQWidgetTexture.cxx
  
  #include <QGraphicsProxyWidget>
  #include <QGraphicsScene>
-@@ -98,7 +98,7 @@ vtkQWidgetTexture::vtkQWidgetTexture()
+@@ -88,7 +88,7 @@ vtkQWidgetTexture::vtkQWidgetTexture()
        }
  
        this->Create2DFromRaw(width, height, 4, VTK_UNSIGNED_CHAR, this->ImageBuffer);

diff --git a/debian/patches/95_java_mach-arch_fix.patch b/debian/patches/95_java_mach-arch_fix.patch
index 73119c26c187867495cefb90c3d9b4704a7f5f31..7f5399c2973fc1a5b28b251984c6b726c051ab2f 100644 (file)
--- a/debian/patches/95_java_mach-arch_fix.patch
+++ b/debian/patches/95_java_mach-arch_fix.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix build on mach-based OS which are not OS X
  include/diy/time.hpp | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-Index: VTK-9.2.5/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
+Index: VTK-9.3.0/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
 ===================================================================
---- VTK-9.2.5.orig/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
-+++ VTK-9.2.5/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
+--- VTK-9.3.0.orig/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
++++ VTK-9.3.0/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
 @@ -3,10 +3,10 @@
  
  #ifndef _WIN32

diff --git a/debian/patches/97_reproducible_builds.patch b/debian/patches/97_reproducible_builds.patch
index 09affe088bc00c721316d9031281671df1291f76..b5ee1418784a73563e600c592b0de87b2e4d0cf6 100644 (file)
--- a/debian/patches/97_reproducible_builds.patch
+++ b/debian/patches/97_reproducible_builds.patch
@@ -8,10 +8,10 @@ Thanks to Bernhard M. Wiedemann <bernhardout@lsmod.de>.
  Utilities/Doxygen/doc_class2example.pl | 1 +
  1 file changed, 1 insertion(+)
 
-Index: VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl
+Index: VTK-9.3.0/Utilities/Doxygen/doc_class2example.pl
 ===================================================================
---- VTK-9.2.5.orig/Utilities/Doxygen/doc_class2example.pl
-+++ VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl
+--- VTK-9.3.0.orig/Utilities/Doxygen/doc_class2example.pl
++++ VTK-9.3.0/Utilities/Doxygen/doc_class2example.pl
 @@ -261,6 +261,7 @@ if (exists $args{"parser"}) {
  } else {
      @parsers = keys %parsers;

diff --git a/debian/patches/98_fix_mpi4py.py b/debian/patches/98_fix_mpi4py.py
index c3fdfc35a95683880a03578700400b5161cda88d..71f1423e8a1da2334c1d96b610b19fba06166597 100644 (file)
--- a/debian/patches/98_fix_mpi4py.py
+++ b/debian/patches/98_fix_mpi4py.py
@@ -2,11 +2,11 @@ Description: Fix mpi4py search
 Author: Anton Gladky <gladk@debian.org>
 Last-Update: 2021-09-17
 
-Index: VTK-9.2.5/Parallel/MPI4Py/vtk.module
+Index: VTK-9.3.0/Parallel/MPI4Py/vtk.module
 ===================================================================
---- VTK-9.2.5.orig/Parallel/MPI4Py/vtk.module
-+++ VTK-9.2.5/Parallel/MPI4Py/vtk.module
-@@ -12,4 +12,3 @@ DEPENDS
+--- VTK-9.3.0.orig/Parallel/MPI4Py/vtk.module
++++ VTK-9.3.0/Parallel/MPI4Py/vtk.module
+@@ -16,4 +16,3 @@ DEPENDS
  PRIVATE_DEPENDS
    VTK::ParallelMPI
    VTK::mpi

diff --git a/debian/patches/99_fix_ftbfs.patch b/debian/patches/99_fix_ftbfs.patch
index fdf8a2c5012feb579de6b0ee9ef6ff316a98ef2f..b7cc0e7684e741de52c83668936d3f829b8872cd 100644 (file)
--- a/debian/patches/99_fix_ftbfs.patch
+++ b/debian/patches/99_fix_ftbfs.patch
@@ -2,10 +2,10 @@ Description: Fix FTBFS
 Author: Anton Gladky <gladk@debian.org>
 Last-Update: 2021-11-14
 
-Index: VTK-9.2.5/CMake/vtkCompilerExtraFlags.cmake
+Index: VTK-9.3.0/CMake/vtkCompilerExtraFlags.cmake
 ===================================================================
---- VTK-9.2.5.orig/CMake/vtkCompilerExtraFlags.cmake
-+++ VTK-9.2.5/CMake/vtkCompilerExtraFlags.cmake
+--- VTK-9.3.0.orig/CMake/vtkCompilerExtraFlags.cmake
++++ VTK-9.3.0/CMake/vtkCompilerExtraFlags.cmake
 @@ -3,7 +3,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
    include(CheckCXXCompilerFlag)
  

diff --git a/debian/patches/gcc-13.patch b/debian/patches/gcc-13.patch
deleted file mode 100644 (file)
index a61b4ac..0000000
--- a/debian/patches/gcc-13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1233ceec268d5366c66f5e79786ec784042b591b Mon Sep 17 00:00:00 2001
-From: Laurent Rineau <laurent.rineau@cgal.org>
-Date: Tue, 17 Jan 2023 16:18:53 +0100
-Subject: Add #include <cstdint> to compile with gcc13
-Origin: upstream, https://gitlab.kitware.com/vtk/vtk/-/commit/1233ceec268d5366c66f5e79786ec784042b591b
-
-The `vtkSEPReader` was introduced by MRs !4909 (from my former
-collaborator Maxime) and !4938. Then it was highly modified by
-!7516. The later MR is the one that introduced the uses of
-`std::uint8_t` and `std::uint32_t`.
-
-Those types needs the inclusion of `<cstdint>`.
----
- IO/Image/vtkSEPReader.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/IO/Image/vtkSEPReader.h
-+++ b/IO/Image/vtkSEPReader.h
-@@ -25,8 +25,9 @@
- #include "vtkImageAlgorithm.h"
- #include "vtkNew.h" // for ivars
- 
--#include <array>  // for std::array
--#include <string> // for std::string
-+#include <array>   // for std::array
-+#include <cstdint> // for std::uint8_t and std::uint32_t
-+#include <string>  // for std::string
- 
- namespace details
- {

diff --git a/debian/patches/series b/debian/patches/series
index bbde548ff14f745077c75c8af43ec6ac2a6be5fc..4408e1ac244b4e2d93d22fcda5ba6e394a82c76a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,11 +4,8 @@
 40_vtkpython-9.patch
 50_fix_python-modules_path.patch
 60_fix_path_perl.patch
-83_allow_gles_platforms.patch
 84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch
 95_java_mach-arch_fix.patch
 97_reproducible_builds.patch
 98_fix_mpi4py.py
 99_fix_ftbfs.patch
-#110_vtk9_netcdf.patch
-gcc-13.patch